Patch has been accepted upstream