Merge commit 'f7c26e9f7ace572f440b80b0e71625295755c38b'
Merge commit 'dc792fdb55013abf9ab3913608fe1a7c1c3fe5f3' as 'externals/xbyak'