0f70c4e update to 3.1.1, copied from f29

Authored and Committed by Dave Dykstra 5 years ago
    update to 3.1.1, copied from f29
    
        
file removed
-2319
file removed
-321
file modified
+113 -136
file modified
+1 -1