Changes merged upstream.