f2ed051 rebase to upstream version 8.38.0

Authored and Committed by jvymazal 5 years ago
    rebase to upstream version 8.38.0
      resolves: rhbz#1632432
      resolves: rhbz#1627944
    
        
file modified
+2 -0
file modified
+6 -1
file modified
+2 -2