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