Merge tag 'nasm-2.13.03rc1'