376315c drop fixes upstreamed

Authored and Committed by pbrobinson 4 years ago
    drop fixes upstreamed
    
        
file modified
+0 -3