1e537a2 Rebase to 1.3.0

Authored and Committed by fnux 6 years ago
    Rebase to 1.3.0
    
        
file modified
+1 -0
file modified
+4 -1
file modified
+1 -1