Merge branch 'osx' of https://github.com/alexey-lysiuk/gzdoom