Merge branch 'master' into 'master'

Till Brehm

2015-11-10 d925b32c307121dd89a4424889c92a8c7f986811

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