9e9fad0 Backport two bugfixes from upstream

Authored and Committed by kalev 5 years ago
    Backport two bugfixes from upstream
    
        
file modified
+11 -2