Merge branch 'master' into 'stable-3.1'

Till Brehm

2016-05-25 9d7ab0a7c93f3d377dbe049e2471c41c25621a01

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