Merge [1463]-[1469] from trunk, updating version as appropriate.

svn path=/branches/yasm-0.5.x/; revision=1470