Merge back from master

Because Git clone will take too long on this connection ha ha ha