Merged from SVN.