Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-04-22 17d53616b36fef3b753fc408bfc600f360673333

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