Merge branch 'nasm-2.12.xx'