Merge pull request #1054 from puppetlabs/release-prep