Merge branch 'master' into 'master'

Marius Cramer

2015-05-05 b2f827b04393eecf33e16d6a883f5e6ff30086d9

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