Imported Upstream version 0.9.4+git20140406