complete merge with octave forge svn