Imported Upstream version 2.4+git20130615