Merge branch 'stable-3.1'

Marius Burkard

2016-02-11 486e424dfd1c57c4b4fef5c01319aca6d53cd7cf

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