bump: upstream version 2.6