New upstream version based on actual 2.5 release