Merge branch 'master' into 'master'

Marius Cramer

2014-06-12 d3be569127300fa335a659c3ea40c100763d5fa9

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