Merge commit '5f7df9a182cdca4d7338289c2e52eddeec9c223d' into HEAD
Merge commit 'a9f62a15cdc6528b804d214325488ba52c619313' as 'externals/fmt'