Tag master and merge it into develop when finishing releases and hotfixes.
Fixes git-describe inconsistencies.