Merge pull request #688 from puppetlabs/msync_modules5187