Merge branch 'rj/libvirtstats'