Merge develop into master and raise the branch aliases to next release.