Merge branch 'master' into 'master'

Marius Cramer

2015-11-12 8ce5e3054e6bc70cc44e8d2d002ac035f02bd9ec

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