Fix calculation of milestone.
Merge branch 'auto-tag' into develop