Update master to be based on minor

This updates master to have all of the changes that are currently in minor, in preparation for a release.