Merge branch 'master' into 'master'

Marius Cramer

2014-03-06 35b30fa77ef939f85b6d31446e8710e8f03486b6

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