Merge "Enable profiling via xhprof"