18f8c5a rebase to v0.5.3

Authored and Committed by erig0 5 years ago
    rebase to v0.5.3
    
        
file modified
+1 -0
file modified
+5 -2
file modified
+1 -1