Updates already made in SVN incorporated into git repository.