Merge commit '6633089a44b13022ddb37a44229c9d9a88a9096f'
Merge commit 'a9f62a15cdc6528b804d214325488ba52c619313' as 'externals/fmt'