40f1fa0 Update to latest upstream release

Authored and Committed by mbooth 5 years ago
    Update to latest upstream release
    
        
file added
+37
file modified
+17 -26
file removed
-17
file modified
+1 -1