Merge pull request #840 from puppetlabs/release