7416c44 rebase to latest upstream version

Authored and Committed by lzaoral 2 months ago
    rebase to latest upstream version
    
    Resolves: rhbz#2273570
    
        
file modified
+1 -0
file modified
+4 -1
file modified
+1 -1