Merge branch 'stable-3.1'

Marius Burkard

2016-05-26 8c6a4706f8bf375738197ed83d1f91d8a17032ef

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