Merge branch 'master' into 'master'

Marius Cramer

2015-07-09 e2963947c8428a8bae4a013e8c88dc4bdf299075

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