Move minor into master in preparation for a release

This moves the latest minor into master in preparation for a release.