Merge branch 'master' into 'master'

Marius Burkard

2015-12-31 238326c6e7528571d0e8c68f310591206256ea77

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