System metrics
Merge pull request #926 from delving/13.06-metrics

System metrics