ifndef WITH_INTERNAL_METRICS then lets not
FORMATTING ONLY; astyle -A10
Merge branch 'master' into internal_metrics_noop