Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-02-12 51e1dde2aa5c31b01f77479fe3fc86dffd2c8f29

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