Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-05-13 3cf77b791fb646e5837dac63a2e8c06604771b1d

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