am fe7aee2d: Merge "More advanced timing loggers."

* commit 'fe7aee2d20b47dad6029a588e0c7394f0c75d080':
  More advanced timing loggers.