Rebase and branch rename of pull request #871

Here I've rebased pull request #871 and also given it a new (less-confusing) branch name.  I wasn't sure if there was a way to update an existing pull request with a new branch name.