Attaching [Patch v2 4/4] since "git send-email" won't let me send it.

-- 
Pierre Neidhardt
https://ambrevar.xyz/