Merge branch 'master' of git+ssh://rich@hakodate/home/rich/d/libguestfs