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