Merge tag 'nasm-2.12.02'