Imported Upstream version 1.11