Merge "Follow the constructor signature change in Minikin." into nyc-dev