Merge pull request #654 from puppetlabs/hunner_msync