1017331 Rebase to version 379

Authored and Committed by tkorbar a year ago
    Rebase to version 379
    
    Resolves: rhbz#2170296
    
        
file modified
+1 -0
file modified
+1 -1
file modified
+6 -2