Merge pull request #684 from puppetlabs/release