Updated from svn repo (r2496).