57a0944 Update to latest upstream release

Authored and Committed by mbooth 6 years ago
    Update to latest upstream release
    Drop upstreamed patch
    
        
file modified
+11 -6