Merge branch 'master' into 'stable-3.1'

Till Brehm

2016-05-26 498c86fbbfc4aa034758693309dd97b7ca4ef4f0

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