Merge pull request #946 from puppetlabs/release