Merge branch 'master' into 'master'

Marius Cramer

2015-02-26 7cbed050417f967f34340661b7d7a8a7e42e5710

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