Hello,
You might want to edit your pull-request to either target the branch-2.1 from upstream, or rebase yours on top of upstream's master; as-it-is it's quiteconfusing :-/
The request has already been acted on and the issue is closed. They did not exactly apply my patch, but their solution does quite the same.
Regards Christoph