5c238a0 rebase to 5.2.12-pre4

Authored and Committed by zdohnal 7 years ago
    rebase to 5.2.12-pre4
    
        
file modified
+1 -0
file modified
+5 -2
file modified
+1 -1