Merged from SVN repo.