538561f Rebase to latest upstream version

Authored and Committed by alakatos a year ago
    Rebase to latest upstream version
      resolves: rhbz#1947184
    
        
file modified
+1 -0
file modified
+6 -2
file modified
+1 -1