Bug 1075645 - Metrics dashboard
Merge remote-tracking branch 'upstream/master'