Merge branch 'master' into 'master'

Marius Cramer

2015-07-07 c755f8131c38a3f0c5f97cf029959789aae133f3

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