Latest GZDoom merges. I'm going to do this proper from now on.