Merge latest Rhine updates from TheMuppets vendors