12a10e3 Backport several patches from upstream

Authored and Committed by Michael Catanzaro 7 years ago
    Backport several patches from upstream
    
        
file modified
+16 -15
file added
+25