Merge branch 'master' into 'master'

Marius Cramer

2015-08-16 3e783660d8cb49f6c5067baf4c7c3bbcd4975846

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