Merge branch 'master' into dashboard-single-line-iterate-stats-is-broken
Merge pull request #170 from xen/dashboard-single-line-iterate-stats-is-broken

Merge branch 'master' into dashboard-single-line-iterate-stats-is-broken