Changed in an outstanding pull request, merged here.