Merge branch 'master' into anna
Merge branch 'anna' of https://github.com/gpns/webvirtmgr into anna