Merge branch 'xhprof' of git://github.com/stronk7/moodle