Merged changes r1927-r1963 from the trunk into multiarch branch.

svn path=/branches/multiarch/; revision=1964