Metze just fixed this in master. I have a patchset that implements the same fixes for 3.6.x. Jeremy.
Created attachment 7047 [details] Back-ported git-am patchset for 3.6.x Metze please review. This is a back-ported patch set from your master fixes. Jeremy.
Comment on attachment 7047 [details] Back-ported git-am patchset for 3.6.x Looks good
Karolin, please pick for the next release
Pushed to v3-6-test. Closing out bug report. Thanks!