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

Till Brehm

2016-06-28 d44c3fa38bb0e29718ad7d4009342faf9d2a32a7

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