Merge remote-tracking branch 'origin/nasm-2.15.xx'