bf3d0ce Rebase on upstream 0.5.16

Authored and Committed by sbonazzo 4 years ago
    Rebase on upstream 0.5.16
    
        
file modified
+1 -0
file modified
+6 -3
file modified
+1 -1