Merged from SVN Repo.