Add default return value.
Merge branch 'master' into drawing-octave