Merge pull request #646 from puppetlabs/modsync