Merge remote-tracking branch 'origin/master' # Conflicts: # scripts/copy-out # scripts/guestfish # test/scripts/guestfish.bats
Merge remote-tracking branch 'origin/master' # Conflicts: # scripts/copy-out # scripts/guestfish # test/scripts/guestfish.bats