Pull in fix from trunk.
Merge branch 'joyent/release/trunk' into joyent/release/trunk_sngl