Merge pull request #1779 from stefanb/tag-colour-preview