Merge to master.

I probably won't merge all these to master, just producing this PR so I can see them all in one place.