Merge branch 'stable-3.1'

Marius Burkard

2016-01-26 c02e3dc6a5b0b65a95a75ca1e37294aee615d108

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