Merge pull request #2315 from mcorbin/feat/riemann-microseconds-resolution