Try to bring this branch up to date with 2.6.0 using a megadiff