(A) Use the new patch DSL: `patch :DATA` (B) add a comment above this patch explaining what it does and including a link to the upstream bug report.