Merge branch 'master' into 'master'

Marius Cramer

2015-10-23 3ff9d214bf9f34c1ffc5f40227119eb44693363d

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