Merge branch 'master' into 'master'

Marius Cramer

2014-02-14 e100328a7f3d495dfddf71f7c71f24ac14bfd9a0

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