Merge branch 'stable-3.1'

Marius Burkard

2016-01-31 3117f2e70389b0a3e03a683ec8b03e4e0a7eea87

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