edea0c1 Rebase to version 2.6.4

Authored and Committed by spichugi a year ago
    Rebase to version 2.6.4
    
    Related: rhbz#2168351
    
        
file modified
+1 -0
file modified
+6 -2
file modified
+1 -0