Merge branch 'master' into 'master'

Marius Cramer

2015-06-27 3ba59d59a2ad4068d78753635531b7625c916258

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