merge upstream
Merge remote-tracking branch 'upstream/anna' into anna
Merge branch 'anna' of https://github.com/gpns/webvirtmgr into anna