2.7.4 patches (9999-re-configure-d.patch needs regenerating)