Merged trivial (but necessary) changes from SVN trunk to git.