Imported Upstream version 1.0.5