Merge branch 'octave-cleanup'

Conflicts:
	CHANGES.current