Merge "Upgrade futures-task to 0.3.25"