Merge tag 'upstream/2.11_beta3+ds'