Fix for #607 (/metrics/metrics called twice).
Merge branch 'unknownboy-master'