New upstream version 2.5