post 2.6.4
Merge remote-tracking branch 'upstream/v2.6' into v2.6