Merge my Node fork into the official repo