merged last svn changes