Synch with carbon-fork's rev c3b3e91.