Merge branch 'nasm-2.05.xx'