Merge pull request #657 from puppetlabs/binford2k-patch-1