Move timings out of adminbar.
Merge remote-tracking branch 'upstream/master'