Merge pull request #589 from DavidS/fm-4046-update-msync