Upstream version 2.10.11.
Merge upstream version 2.10.11.