Merge branch 'master', remote-tracking branch 'upstream/master'
formatting metric names
Merge pull request #43 from Flipkart/master

metric name formatting