Merge pull request #612 from puppetlabs/modulesync