Merge commit 'nasm-2.07rc7' into new-preproc