Merge pull request #970 from puppetlabs/release