Merge branch 'stable-3.1'

Marius Burkard

2016-02-12 b0f818efec0b74741d6fa53d0e86a95065d4e2d1

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