4a44490 Backport fixes from upstream

Authored and Committed by ellert 7 years ago
    Backport fixes from upstream
    
        
file added
+25
file modified
+11 -0