f344d3d Rebase to 1.12.2

Authored and Committed by jcajka 5 years ago
    Rebase to 1.12.2
    Resolves: BZ#1688996
    
        
file modified
+1 -0
file modified
+7 -3
file modified
+1 -1