Update our fork from Rune's

I'd suggest we pull these changes back into our master to make them up-to-date with Rune's master.

Although we could do so by clicking the "Merge" button, I wonder if we should actually to a fast-forward merge  on the commandline, partly because we can, and partly because otherwise our repos will never get in-sync (we'd then be ahead of his master by the one merge commit).