New upstream version 2.6