I have exactly the same change, but I haven't made a pull request yet. However, this has nothing to do with the topic of this commit, so I think it should be at least in a separate one.