Merge branch 'master' into 'stable-3.1'

Till Brehm

2016-04-26 2e86dd528354a8267521e045a185f920683e4724

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