Found at SNIA-SDC on a very NetBIOS-noisy network.
Created attachment 10330 [details] git-am fix for 4.1.next, 4.0.next. Fix that went into master, applies cleanly to 4.1.next, 4.0.next.
Re-assigning to Karolin for inclusion in 4.1.next, 4.0.next.
Pushed to autobuild-v4-[0|1]-test.
Pushed to both branches. Closing out bug report. Thanks!