629af90 rebase to latest upstream version

Authored and Committed by lzaoral 17 days ago
    rebase to latest upstream version
    
    Resolves: rhbz#2277307
    
        
file modified
+4 -4
file modified
+5 -2
file modified
+2 -2