Merge pull request #1 from joyent/master

.