Fix bad doc merge to follow upstream tree