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

Till Brehm

2016-06-28 225c7a38631d06798f7e98dc250a98cdd1bbf7f4

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