git-am fix for 4.2, backport from master.
Created attachment 10529 [details] git-am fix for v4-2-test that went into master
Comment on attachment 10529 [details] git-am fix for v4-2-test that went into master LGTM.
Re-assigning to Karolin for inclusion in 4.2.0rc3. Jeremy.
Pushed to autobuild-v4-2-test.
Pushed to v4-2-test. Closing out bug report!