Merge branch 'master' into 'master'

Marius Cramer

2015-11-14 b717d292577f33f2e2ca044da469d8663aa982f6

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