Patch to be attached after bug creation. Please apply with 'git am'. Thanks.
Created attachment 244720 [details] Please apply with 'git am'
Your patch is also imported in bug #276684