Found by Volker and patch already applied to master.
Created attachment 6749 [details] git-am fix for 3.6.0 This needs to be picked for 3.6.0. Jeremy.
Comment on attachment 6749 [details] git-am fix for 3.6.0 Yes, looks correct
Karolin, please pick this one
Pushed to v3-6-test. Closing out bug report. Thanks!