Merge pull request #1118 from puppetlabs/release-prep