Backport 0.85 update from trunk
Update wip
Merge branch 'joyent/feature/miscfix/2013Q2' into joyent/release/2013Q2