merge octave forge svn