Merging from trunk

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