context: merge from trunk


[SVN r85162]