Merge commit '7daa26f9ba3ca45813d16ce540564448c13b16fa' into nasm-2.14.xx