patch was merged upstream