update version
Merge remote-tracking branch 'origin/2_6_1_patch3' into 2_6_1_patch3