Merge branch 'master' into 'master'

Marius Cramer

2015-01-30 accfcafdae46cfc1cc5567ee111c63dc223b6c8e

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