Merge branch 'master' into 'master'

Marius Cramer

2014-03-29 85e29ab6d2cd43e348cba2c6a73a7263217d139d

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