af8d44c rebase to latest upstream version

Authored and Committed by lzaoral a month ago
    rebase to latest upstream version
    
    Resolves: rhbz#2278126
    
        
file modified
+2 -2
file modified
+5 -2
file modified
+2 -2