Merge branch 'master_fixes' into 'master'

Dominik

2014-02-26 5a2985f97fb4ef24085722957b3a5e53bfa38949

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