Merged and broke the [damned] thing, use the old school patch to fix .. (for now)

  ~$ patch -p1 < fixthething.patch