Fix in master (56e2384dfe29fd8f16b9d0cf7264f9bb8ed38966) that's needed in 4.2.
Created attachment 10602 [details] git-am for 4.2 cherry-picked from master
Reassigning to Karolin for inclusion in 4.2.
(In reply to Ralph Böhme from comment #2) Pushed to autobuild-v4-2-test.
Pushed to v4-2-test. Closing out bug report. Thanks!