ef6081 Backport upstream fixes

Authored and Committed by ignatenkobrain a year ago
    Backport upstream fixes
    
    Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
    
        
file modified
+22 -3