Merge pull request #629 from puppetlabs/modulesync