Merge branch 'mergebranch'

Marius Burkard

2016-01-04 cb287d1f1be13beaba7fe84c906dd0683dfb9fb5

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