Merge commit 'a7f9129f18b171ecec9533921ba32449b3c394ac'
Merge commit 'a9f62a15cdc6528b804d214325488ba52c619313' as 'externals/fmt'