Merge remote-tracking branch 'zdoom/master' into NewStuff