We haven't merged from upstream master since this commit on Nov 1: 0cba535af3c65618f342fa2d7db9647f5e6f6f1b