merge with branch 'osx' from "https://github.com/alexey-lysiuk/gzdoom.git"