I think this daggy fix is based on the right commit... but it looks like it's going to need an integration branch in order for it to merge cleanly. This mean either:
Creating a new branch from the HEAD of master, then merging this commit in to that branch, and PRing that branch.
this is daggy fix over - db0a4952