Fix in master (d9c22a3af2ac319d075a952c71496b6b76c83fcf) that's needed in 4.2.
Created attachment 10595 [details]
git-am fix for 4.2 backported from master
Reassigning to Karolin for inclusion in 4.2.
Make this a blocker for 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.