Updated to latest changes from SVN repo.