Merge pull request #660 from puppetlabs/modules-4528