Imported upstream version 2.4+git20130310