Merge pull request #833 from puppetlabs/anchor-tags