Merge branch 'master' into 'master'

Marius Cramer

2015-06-03 1e24e990804732a0f6981cd2db7fda2da11b29ed

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