Merge "Upgrade futures-macro to 0.3.25"