Merge branch 'master' into 'master'

Marius Burkard

2015-12-23 4100550ca57282b76338ed3d16993189d7302037

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