Merge branch 'patch-1' into 'stable-3.1'

Till Brehm

2016-04-27 65dc1a19e784f20f4b275c0fdc519d27a4a9b08e

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