Accounting for upstream change not yet merged to master. Not necessarily needed yet, but shouldn't hurt to add and it will prevent us from pushing a broken auto build when it is merged upstream.
EDIT: Well, according to a local test, it breaks the current stable so I'll close this PR for now but leave the branch here. When upstream merges, we can merge this change.
Well, according to a local test, it breaks the current stable so I'll close this PR for now but leave the branch here. When upstream merges, we can merge this change.
Accounting for upstream change not yet merged to master. Not necessarily needed yet, but shouldn't hurt to add and it will prevent us from pushing a broken auto build when it is merged upstream.
EDIT: Well, according to a local test, it breaks the current stable so I'll close this PR for now but leave the branch here. When upstream merges, we can merge this change.