Merge pull request #3165 from akoeplinger/fix-clock-monotonic-macos1012