Imported Upstream version 2.6.0~rc3
Merge tag 'upstream/2.6.0_rc3'

Upstream version 2.6.0~rc3