a1dcd3 Backport two more bugfix patches

Authored and Committed by dcavalca a year ago
    Backport two more bugfix patches
    
        
file modified
+8 -1
file added
+68