Has this been merged upstream?