Imported Upstream version 2.11.0
Merge tag 'upstream/2.11.0'

Upstream version 2.11.0