merge in dist-tags, don't clobber
v2.0.4