e3198cb Backport all patches to current git master (#1674322 etc.)

Authored and Committed by adamwill 5 years ago
    Backport all patches to current git master (#1674322 etc.)
    
        
file added
+80
file modified
+32 -2