Patch has merged upstream