Merge latest Chocolate Doom