Merge branch 'master' of https://github.com/rheit/zdoom

Includes:
Merge branch 'handshake-hotpatch' of https://github.com/Edward850/zdoom
Merge branch 'master' of https://github.com/j-palomo/zdoom