Add freedoom changes
Merge branch 'master' into freedoom
rename files
Rename file