Already fixed by Volker in master, just needs a back port.
Created attachment 7957 [details] git-am fix for 4.0.0rc2 Fix that went into master.
Re-assigning to Karolin for inclusion in 4.0.0rc2. Jeremy.
Pushed to v4-0-test. Closing out bug report. Thanks!