7cddda4 rebase to 5.2.13

Authored and Committed by zdohnal 6 years ago
    rebase to 5.2.13
    
        
file modified
+1 -0
file modified
+6 -3
file modified
+1 -1