Merge pull request #296 from puppetlabs/release