Merging rnc PR#10 over the top of my PR#13, and adding repo type to Artifact