A nice blended pull request.