c35352a Backport minor fixes from upstream

Authored and Committed by jgrulich 9 years ago
    Backport minor fixes from upstream
    
        
file modified
+6 -1