Created attachment 14292 [details] Patches for 4.7.x
Created attachment 14293 [details] Patches for 4.8.x
Hi Karolin, This is ready for 4.7 and 4.8. Thanks...
(In reply to Martin Schwenke from comment #3) Pushed to autobuild-v4-[8,7]-test.
Pushed to both branches. Closing out bug report. Thanks!