550c0e7 Update to latest upstream release

Authored and Committed by mbooth 6 years ago
    Update to latest upstream release
    Includes fix for CVE-2017-12626
    
        
file modified
+2 -11
file modified
+2 -2
file modified
+26 -25
file modified
+1 -7