Created attachment 14393 [details] Patches for 4.9.x
Hi Karolin, This is ready for 4.9. Thanks...
(In reply to Martin Schwenke from comment #2) Pushed to autobuild-v4-9-test.
Pushed to v4-9-test. Closing out bug report. Thanks!