c892c4f rebase to v2.1.2

Authored and Committed by erig0 a month ago
    rebase to v2.1.2
    
        
file modified
+1 -0
file modified
+4 -1
file modified
+1 -1