Merge pull request #2721 from ludovic-henry/fix-mono_ms_ticks