merge joyent update.