Pull in misc fixes from trunk.

Conflicts:
	math/octave/distinfo