Updated from SVN revision 357.