Merge the dev branch with the master
This tag has no release notes.