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