Found by Laurent Gaffie <laurent.gaffie@gmail.com> Patch to follow. Jeremy.
Created attachment 5501 [details] git am patch. Written by Volker, confirmed by the bug reporter. Applied to master. Jeremy.
Re-assigning to Karolin for inclusion in the next 3.5.x and 3.4.x. Jeremy.
Pushed to v3-5-test and v3-4-test. Closing out bug report. Thanks!