Merge branch 'master' into 'master'

Marius Cramer

2014-01-24 b50d36a340f2cb3a54f7fa29699ec5d0f064f31c

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