sync from upstream svn repo