Merge commit '49041cb4514956a8754df6f1845f5593037ac870' into HEAD
Merge commit '15a8975273ff2ef472939aab4a39a6c4bdc1898d' as 'externals/fmt'