Merge branch 'master' into 'master'

Marius Cramer

2014-01-24 20e30b45aaaf068b0391ff4679e4f44a0fae8d6e

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