7e6c4a6 Update to latest upstream release

Authored and Committed by mbooth 6 years ago
    Update to latest upstream release
    Drop upstreamed CVE patches
    
        
file removed
-227
file removed
-24
file modified
+11 -11
file modified
+1 -1