Update master to be based on minor

This updates master to be based on minor, in preparation for a release.