Merge master into mongo-for-posts

The other PR can't be merged because of changes to `master`.