Merge branch 'master' into 'master'

Marius Cramer

2014-07-07 b4945ae0c3f4e108090d05b34b3e7df8a753a2ec

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