900a00c rebase to latest version

Authored and Committed by lzaoral 4 months ago
    rebase to latest version
    
    Resolves: rhbz#2258293
    
        
file modified
+10 -6
file modified
+2 -2
file added
+724