update from svn r94275