Merge branch 'nasm-2.09.xx'