Bring master up to speed.

In particular, putting this up to bring in #826 pronto.