This is #1467 rebased on master and with a couple of tweaks.
I tried to make the changes as follow-up commits to that PR (using this GitHub feature), but was getting permission errors - I believe since the repo owner isn't the same as the PR author - so had to split this out to a new PR (I've kept the commit author info).
This is #1467 rebased on master and with a couple of tweaks.
I tried to make the changes as follow-up commits to that PR (using this GitHub feature), but was getting permission errors - I believe since the repo owner isn't the same as the PR author - so had to split this out to a new PR (I've kept the commit author info).
Closes #1467.