88ef950 Backport fixes for sf bugs #380 and #381

Authored and Committed by alexpl 5 years ago
    Backport fixes for sf bugs #380 and #381
    Merge all post-1.25 bugfixes as the same files are being edited
    
        
file modified
+7 -5