Merge branch 'nasm-2.11.xx'