Merge pull request #662 from puppetlabs/modules-4506