Merge in v2.6.14 by hand