Merging latest Chocolate Doom changes