Merge pull request #2275 from octo/ff/prometheus