Created attachment 8228 [details] Patch Also applies to 4.0 and master
Comment on attachment 8228 [details] Patch LGTM - pushed to autobuild.
Re-assigning to Karolin for inclusion in 4.0.0. Jeremy.