Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-04-26 6c189dba224d1e1de138e763d8146fea21bc6a2f

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