Merge "Upgrade futures-core to 0.3.25"