Fix in master that's needed in 4.2.
Created attachment 10570 [details] git-am fix for 4.2 that went into master
Comment on attachment 10570 [details] git-am fix for 4.2 that went into master Looks good.
Karolin, please add the patch to 4.2. Thanks!
Pushed to autobuild-v4-2-test.
Pushed to v4-2-test. Closing out bug report. Thanks!