Merge pull request #707 from puppetlabs/jbondpdx-patch-1