Merge branch 'stable-3.1'

Marius Burkard

2016-02-04 eca13b968042fe7c21a5a01daaf1e1dffd3a83c6

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