Updated to GZDoom r1560 and ZDoom r4242