Merge branch 'stable-3.1'

Marius Burkard

2016-03-02 59f3ca6201c1487f3a4aceafe2c4a96201e58ce7

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