Merge pull request #1092 from puppetlabs/release-prep