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