43d4ca Backport some more fixes from upstream to hopefully fix apper.

Authored and Committed by Richard Hughes 6 years ago
    Backport some more fixes from upstream to hopefully fix apper.
    
        
file modified
+4 -1