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