91fa4f9 Backport fixes for RHBZ#1616118 from upstream master

Authored and Committed by adamwill 5 years ago
    Backport fixes for RHBZ#1616118 from upstream master
    
        
file modified
+8 -1