Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-05-26 6028e4692d172b63f8af79c4460f9dbff5a9a01c

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