Merge branch 'master' into 'master'

Marius Cramer

2015-03-06 39a2d33c4680fe0a0fcd10e864d075f520d9905e

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