Are you sure you want to bring this in on this pull req?  Isn't there a different pull request for this one?