abd1baa Backported regression fixes from upstream

Authored and Committed by Nikos Mavrogiannopoulos 5 years ago
    Backported regression fixes from upstream
    
        
file modified
+6 -1