Merge commit 'a296373f0fd1b44a73c9509d0e3c1f2f078ddd42'
Merge commit '15a8975273ff2ef472939aab4a39a6c4bdc1898d' as 'externals/fmt'