post 2.6.0-rc0
Merge remote-tracking branch 'upstream/master'