Merge commit '43330ec3ba6dae3829675874258bdd717d0f3f19'
Merge commit 'dc792fdb55013abf9ab3913608fe1a7c1c3fe5f3' as 'externals/xbyak'