Revert "Revert "Merge remote-tracking branch 'origin/master' into Cataclysm""

This reverts commit 4060c4f4ead79d49d5c0f72859d239711cc0b23a.