My only nit-pick here is this.  Which seems to be a change completely unrelated to the commit (and you don't even mention it in either the commit messages or pull request).