Merge branch 'master' into 'master'

Marius Cramer

2015-07-02 f3ff1e4ba5174dd559890483dd7dded8a04c10fd

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