Patches to follow.
Created attachment 13645 [details] Proposed patch for master.
Comment on attachment 13645 [details] Proposed patch for master. Pushed.
Created attachment 13657 [details] git-am fix for 4.7.next, 4.6.next. Cherry-picked from master.
Reassigning to Karolin for inclusion in 4.6 and 4.7.
(In reply to Ralph Böhme from comment #4) Pushed to autobuild-v4-{7,6}-test
(In reply to Karolin Seeger from comment #5) Pushed to both branches. Closing out bug report. Thanks!