Merge branch 'mergebranch' into 'master'

Marius Burkard

2016-01-04 a4e127a6af97041b2c067f888f8c73a8aec682f1

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