Thanks Raphaël Hertzog for the report and help on the patch, and Tim Graham for the review. Backport of 170f7115bbae45f26ca8078e749dfe67445a57ea from master
Thanks Raphaël Hertzog for the report and help on the patch, and Tim Graham for the review. Backport of 170f7115bbae45f26ca8078e749dfe67445a57ea from master