Patch updated against the current master.