Merge branch 'nasm-2.07.xx'