Change the order of the actions in the release.

With this change we are following more accurately:
http://nvie.com/posts/a-successful-git-branching-model/

Also, we achieve a clean version in master.
If we do the tag before the merge in master, then we would have an extra
commit after the tagging, which causes version to be X.Y.Z-1-blah.