Merge commit '1812bd20d08020bfff2ca15e23c0377a21e3cee0'
Merge commit 'dc792fdb55013abf9ab3913608fe1a7c1c3fe5f3' as 'externals/xbyak'