update the hotfix with the files from master.