upgrade to 2.6.0 and 9.6.0
Merge remote-tracking branch 'origin/master'