Merge branch 'master' into 'stable-3.1'

Till Brehm

2016-06-17 522bede75fce4a0e3a7d2c7eff1eee198b900a22

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