Imported Upstream version 2.10
Imported Upstream version 2.11