976da1 Update to latest patches from eparis/Upstream

Authored and Committed by dwalsh 7 years ago
    Update to latest patches from eparis/Upstream
    
        
file modified
+75 -19
file modified
+5 -2