Merge pull request #1636 from alexrp/profiler-stuff