Back build fix from trunk.
Merge remote-tracking branch 'origin/joyent/feature/miscfix/2014Q1' into joyent/release/2014Q1
Update joyent