Updates from SVN revision 354.