Found by David Disseldorp <ddiss@suse.de>. Patch for 3.6.1 and 3.5.next to follow.
Created attachment 6955 [details] git-am fix for 3.6.1 Code that went into master. David please review and +1.
Created attachment 6956 [details] git-am fix for 3.5.next Please +1 and then I'll re-assign to Karolin for inclusion in 3.5.next.
Comment on attachment 6955 [details] git-am fix for 3.6.1 Looks good.
Re-assigning to Karolin for inclusion in 3.6.1 and 3.5.next. Jeremy.
Pushed to v3-5-test and v3-6-test. Closing out bug report. Thanks!