Merge pull request #650 from puppetlabs/hunner_msync