Merge branch 'aesni'