4222486 Backport some fixes from upstream

Authored and Committed by Richard Hughes 10 years ago
    Backport some fixes from upstream
    
        
file modified
+7 -3