Merge branch 'master' into 'stable-3.1'

Till Brehm

2016-07-20 f4719e1b4419a5ccbcdafe7c717c7d78c4b366ae

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