merge from joyent:master