git ref ea00f0e452f64868fdc78cf0dc8e9ce3af19fe32 needs to be picked from master to fix this (patch by metze).
Created attachment 6969 [details] git-am fix for 3.6.1 Patch from master.
Comment on attachment 6969 [details] git-am fix for 3.6.1 Looks good
Karolin, please pick for the release
Pushed to v3-6-test. Closing out bug report. Thanks!