Merge branch 'master' into 'master'

Marius Cramer

2015-09-13 1ec1fc69c4b550b15f3b04d2988e2138a5e22477

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