Merge branch 'master' from https://github.com/ChillyDoom/zdoom.git