Merging from trunk

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