Merging from trunk

svn path=/branches/release/libs/conversion/; revision=84745