Merge branch 'master' into 'master'

Till Brehm

2015-09-24 cedad166fa7655b0a49e7e27c57bbee78032fbe7

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