Merge latest Chocolate Doom code