Pull in misc fixes from trunk.

Conflicts:
	math/octave/distinfo
Merge branch 'joyent/feature/miscfix/2013Q3' into joyent/release/2013Q3
Update 'joyent' submodule.
Update joyent and wip
Merge remote-tracking branch 'upstream/joyent/release/2013Q3' into joyent/release/2013Q3

Conflicts:
	joyent