Imported Upstream version 0.10.0.5