+ merge from SVN