My PR has been merged upstream.