Imported Upstream version 2.11.0