Merge pull request #980 from puppetlabs/release-prep