update from svn r94285