Patch from Noel to follow.
Created attachment 13431 [details] git-am fix for 4.7.0, 4.6.next Cherry-picked from master (with bug number added).
Comment on attachment 13431 [details] git-am fix for 4.7.0, 4.6.next LGTM
@Karolin: please merge
(In reply to David Disseldorp from comment #3) Pushed to autobuild-v4-{7,6}-test.
(In reply to Karolin Seeger from comment #4) Pushed to both branches. Closing out bug report. Thanks!