Merge branch 'master' into 'master'

Marius Cramer

2014-08-18 a9e6315be66a5cf3a743a1e1a7c8da4eb980e97c

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