Merge branch 'master' into 'master'

Marius Cramer

2015-06-07 fc0edb2f00bcdc6baaaa29f9041e82f3003b9b44

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