Here are the changes that I have made to your patch, based on a fork of your repo, so that there is just one patch to apply to R (rather than me trying to keep track of separate changes that I have made). Sorry, I should have done this (forked your repo) from the start.
Here are the changes that I have made to your patch, based on a fork of your repo, so that there is just one patch to apply to R (rather than me trying to keep track of separate changes that I have made). Sorry, I should have done this (forked your repo) from the start.