Merge pull request #636 from puppetlabs/hunner_msync