Support tagging.
Merge branch 'master' into tagging