Merge branch 'master' into 'master'

Marius Cramer

2015-02-18 c582da1780e3d11b0d12deb42de281b92d76bf6f

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