Merge branch 'master' into 'master'

Marius Cramer

2014-11-06 a66bbd6cba18494f48190025b525f903ef3d384d

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