Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-01-26 b3e7785b3ab5ea70675e0d944b3a746464c4143f

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