826102c Update to latest upstream version

Authored and Committed by mbooth 6 years ago
    Update to latest upstream version
    
        
file modified
+1 -4
file modified
+8 -4
file modified
+1 -1