Merge pull request #621 from puppetlabs/modulesync