sync with svn version