Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-03-08 81a4dc5a1f17848bf544dae54582097b93c295cc

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