Better profiler output
Merge remote-tracking branch 'upstream/master' into lock