Merging from trunk

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