0d312c2 Rebase to 0.11.1

Authored and Committed by error 4 years ago
    Rebase to 0.11.1
    
        
file modified
+1 -0
file modified
+5 -2
file modified
+1 -1