context: merge from trunk

svn path=; revision=84673