Bastien Fri, 30 Apr 2021 00:01:24 -0700
Applied in maint as commit e2ffee96d - thanks Aaron for the patch and Tim for the confirmation.
-- Bastien