7dbe008 rebase to v0.5.2

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