87f100f Rebase to version 356

Authored and Committed by tkorbar a year ago
    Rebase to version 356
    
    Resolves: rhbz#1830237
    
        
file modified
+1 -0
file modified
+1 -1
file modified
+4 -1