Imported upstream version 2.4.1
Imported upstream version 2.5