Merge branch 'trunk' into joyent/feature/miscfix/trunk