Merge pull request #1016 from puppetlabs/kreeuwijk-patch-1