Imported Upstream version 2.10.0.1