Merged, thank you David and Mathieu!

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