Created attachment 13699 [details] Patch for master Still running through a private autobuild
Created attachment 13703 [details] Patch for both 4.6 and 4.7 Applies cleanly to both 4.6 and 4.7
Reassigning to Karolin for inclusion in 4.6 and 4.7.
(In reply to Ralph Böhme from comment #3) Pushed to autobuild-v4-{7,6}-test.
(In reply to Karolin Seeger from comment #4) Pushed to both branches. Closing out bug report. Thanks!