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

Till Brehm

2016-07-21 4f8673d1eef39fde0e5d1a3ca6580f396f14ff63

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