Merge branch 'master' into 'master'

Marius Cramer

2014-08-14 c0914f828a0087636eb775c984680a410d975494

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