907c56b Rebase to v0.20.12

Authored and Committed by coec 7 years ago
    Rebase to v0.20.12
    
        
file modified
+1 -0
file modified
+9 -6
file modified
+1 -1