Merge pull request #733 from puppetlabs/maint_modsync_1d81b6a