Imported Upstream version 1.10.1