967382e Rebase to 1.20.0

Authored and Committed by zdohnal 6 years ago
    Rebase to 1.20.0
    
        
file modified
+1 -0
file modified
+5 -2
file modified
+1 -1