9cb2243 Update to upstream 2.6.0, including renaming some PR numbers

Authored and Committed by Dave Dykstra 5 years ago
    Update to upstream 2.6.0, including renaming some PR numbers
    
        
file added
+2319
file added
+321
file modified
+12 -6
file modified
+1 -1