Adding upstream svn changes