New upstream version 2.7