Merge branch 'stable-3.1'

Marius Burkard

2016-02-12 d9fcae91955e8b6441279c9fb2e2de93c5ca432e

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