40a5e5 update to upstream version 2.6.0

Authored and Committed by Felix Schwarz 5 years ago
    update to upstream version 2.6.0
    
        
file modified
+1 -0
file modified
+5 -2
file modified
+1 -1