Merge branch 'stable-3.1'

Marius Burkard

2016-02-10 88c307b0ef30a94ea5e9b52a1f9078bf04033d29

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