Merge branch 'master' into 'master'

Marius Cramer

2014-03-25 f2851d17638c18984387c1bcca3b80152ad4b21a

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