Merge pull request #701 from puppetlabs/msync_18sep17_892c4cf