Imported Upstream version 1.10
Imported Upstream version 1.11