Import new upstream version 2.6.13