Backmerge master

Merge @MissingHandle change back into our fork