Merge pull request #658 from puppetlabs/MODULES-4528