Merge branch 'master' into 'master'

Marius Burkard

2016-01-10 c2dd9c58d6d3590c519e42bb2ec8e6a56e071118

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