Merge commit '097203968f0a9b17628062f4adca63ea5cb97aa2' into HEAD
Merge commit 'a9f62a15cdc6528b804d214325488ba52c619313' as 'externals/fmt'