Merge branches 'master' and 'nasm-2.09.xx'