Merge branch 'master' into 'master'

Marius Cramer

2015-09-03 57963434331b48627cc2a0bfcff3924b0112995e

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