Merge tag 'nasm-2.15'