Merge branch 'master' into 'master'

Marius Burkard

2015-12-13 d240f6d285ea4696b087763d99089591cb02fcfd

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