Merge pull request #1080 from puppetlabs/release-prep