a962d7 Backport several fixes

Authored and Committed by Richard Hughes 2 years ago
    Backport several fixes
    
        
file modified
+9 -1
file added
+74