Based on parkr's pull request #556.
If the tests are all working, this seems fine to me.
+1 for this.
@edeustace, you might consider making those changes on a feature branch and re-submitting your pull request. Bad practice to merge master with master :)
Hi @parkr - I've done that here's the pull request: #685