830c47a rebase to 1.4.0

Authored and Committed by jvymazal 4 years ago
    rebase to 1.4.0
      resolves: rhbz#1425638
    
        
file modified
+1 -0
file modified
+9 -5
file modified
+1 -1