657810b Rebase to the latest upstream version

Authored and Committed by osloup a year ago
    Rebase to the latest upstream version
    Resolves rhbz#2171683
    
        
file modified
+6 -2
file modified
+1 -1