841845d in master has the fix
Created attachment 11404 [details] Patch
BTW, I think this should be applied to all releases
Comment on attachment 11404 [details] Patch Pushed to autobuild-v4-{1,2,3}-test with cherry-pick information
Pushed to v4-{2,3}-test. autobuild-v4-1-test is still pending
Pushed to v4-1-test