Imported Upstream version 1.0.6+git23042014