Merge [1473] from 0.5.x branch ([1463] from trunk) missed earlier.

svn path=/tags/yasm-0.5.0rc2/; revision=1474