[ranger/f21] (2 commits) ...hack up the patch to apply to vanilla 1.6.1

[Ben Boeckel]

Summary of changes:

  e088ba0... Fix the right file (was the source file, but upstream regen (*)
  2fc523e... hack up the patch to apply to vanilla 1.6.1 (*)

(*) This commit already existed in another branch; no separate mail sent