Merge pull request #283 from DavidS/fm-4049-update-msync