Merge upstream changes

This merges in the latest trivial changes from upstream.

It's good to keep our branch in sync!