Created attachment 14731 [details] patch from master for 4.9
Created attachment 14732 [details] patch from master for 4.8
Reassigning to Karolin for inclusion in 4.8 and 4.9.
Pushed to autobuild-v4-{9,8}-test.
Pushed to both branches. Closing out bug report. Thanks!