Merge tag 'upstream/2.11_beta2+ds'