Merge branch 'nasm-2.08.xx'