Merge branch 'stable-3.1'

Marius Burkard

2016-02-11 dfadc85817ae71a7a9bff48ae74bb7293df0d58e

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