Merge branch 'master_fixes' into 'master'

Till Brehm

2014-03-26 deb3716e433556f4d259a98ac3969169d11d779a

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