Merge pull request #860 from puppetlabs/release