Updated metrics to work with the donut graph type.
Merge remote-tracking branch 'origin/master'