Merge branch 'master' into 'stable-3.1'

Till Brehm

2016-04-05 077c4a5ca83ef43f75c1688023c2d9494a407db4

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