Merge branch 'master' into 'stable-3.1'

Till Brehm

2016-04-25 8ec5ab5eb9627b5968e6b52a98ff47d228de864a

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