Merge release branch into master
@david-keitel pointed out that tags made from the release branch don't make it into the history of master. Long-term we may want to try a better solution, but for now, this MR will add these commits to that history.
Closes #701