Merge branch 'master' into 'master'

Marius Cramer

2014-10-31 474f4595c7aa07c678dceb90d06dfecf51007dd0

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