faa939b update to 3.1, remove merged patches

Authored and Committed by notting 6 years ago
    update to 3.1, remove merged patches
    
        
file modified
+1 -1
file removed
-279
file removed
-30
file modified
+4 -7
file modified
+1 -1