Merge pull request #950 from puppetlabs/release