Merge "Upgrade futures-sink to 0.3.25"