b0a6784 Add further upstream suggested backports.

Authored and Committed by psutter 6 years ago
    Add further upstream suggested backports.
    
        
file modified
+15 -1