Somehow xhprof_error not defined on my box
Test
Test
Merge remote-tracking branch 'origin/master'