Merge "Upgrade futures-test to 0.3.25"