Merge pull request #977 from puppetlabs/release-prep