Brought in code from SVN repo.