a2478bf Backport two more fixes from upstream

Authored and Committed by adamwill 2 years ago
    Backport two more fixes from upstream
    
    Signed-off-by: Adam Williamson <awilliam@redhat.com>
    
        
file modified
+12 -1