update 2.2.6
Merge remote-tracking branch 'upstream/master'