Can lead to a crash.
Created attachment 7355 [details] git-am fix that went into master - applies to v3-6-test Andrew - please review for 3.6.next (applies cleanly).
Comment on attachment 7355 [details] git-am fix that went into master - applies to v3-6-test Attachment also applies cleanly to v3-5-test.
Re-assigning to Karolin for inclusion in 3.5.next and 3.6.next. Jeremy.
Pushed to v3-6-test and v3-5-test (double-checked that it is already in v4-0-test). Closing out bug report. Thanks!