Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-01-20 ba59737e157c0e1ce23b2443f08733b9f9a38bfe

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