Merge branch 'fix-3986' into 'stable-3.1'

Till Brehm

2016-07-21 d682d6652ac253e601b76f7a8f3cd38ba31ea73e

1
ALTER TABLE  `sys_session` CHANGE  `session_id`  `session_id` VARCHAR( 64 ) CHARACTER SET latin1 COLLATE latin1_swedish_ci NOT NULL;