diff --git a/Android.bp b/Android.bp
index 2ab4b41..76ef162 100644
--- a/Android.bp
+++ b/Android.bp
@@ -46,4 +46,4 @@
 }
 
 // dependent_library ["feature_list"]
-//   once_cell-1.4.0 "std"
+//   once_cell-1.4.1 "std"
diff --git a/Cargo.toml b/Cargo.toml
index 889a333..6f872c6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,11 +13,11 @@
 [package]
 edition = "2018"
 name = "futures-task"
-version = "0.3.5"
+version = "0.3.7"
 authors = ["Alex Crichton <alex@alexcrichton.com>"]
 description = "Tools for working with tasks.\n"
 homepage = "https://rust-lang.github.io/futures-rs"
-documentation = "https://docs.rs/futures-task/0.3.5"
+documentation = "https://docs.rs/futures-task/0.3.7"
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/rust-lang/futures-rs"
 [package.metadata.docs.rs]
diff --git a/Cargo.toml.orig b/Cargo.toml.orig
index fdf27ca..f07ec6f 100644
--- a/Cargo.toml.orig
+++ b/Cargo.toml.orig
@@ -1,12 +1,12 @@
 [package]
 name = "futures-task"
 edition = "2018"
-version = "0.3.5"
+version = "0.3.7"
 authors = ["Alex Crichton <alex@alexcrichton.com>"]
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/rust-lang/futures-rs"
 homepage = "https://rust-lang.github.io/futures-rs"
-documentation = "https://docs.rs/futures-task/0.3.5"
+documentation = "https://docs.rs/futures-task/0.3.7"
 description = """
 Tools for working with tasks.
 """
diff --git a/METADATA b/METADATA
index 44c42a4..c68b40e 100644
--- a/METADATA
+++ b/METADATA
@@ -7,13 +7,13 @@
   }
   url {
     type: ARCHIVE
-    value: "https://static.crates.io/crates/futures-task/futures-task-0.3.5.crate"
+    value: "https://static.crates.io/crates/futures-task/futures-task-0.3.7.crate"
   }
-  version: "0.3.5"
+  version: "0.3.7"
   license_type: NOTICE
   last_upgrade_date {
     year: 2020
-    month: 5
-    day: 8
+    month: 10
+    day: 25
   }
 }
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 889fec3..5dd9d80 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -2,11 +2,18 @@
 {
   "presubmit": [
     {
-      "name": "futures-task_host_test_src_lib",
-      "host": true
+      "host": true,
+      "name": "futures-task_host_test_src_lib"
     },
     {
       "name": "futures-task_device_test_src_lib"
+    },
+    {
+      "host": true,
+      "name": "futures-util_host_test_src_lib"
+    },
+    {
+      "name": "futures-util_device_test_src_lib"
     }
   ]
 }
diff --git a/src/lib.rs b/src/lib.rs
index 5f919f8..0366689 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -9,9 +9,14 @@
 #![cfg_attr(test, warn(single_use_lifetimes))]
 #![warn(clippy::all)]
 
+// mem::take requires Rust 1.40, matches! requires Rust 1.42
+// Can be removed if the minimum supported version increased or if https://github.com/rust-lang/rust-clippy/issues/3941
+// get's implemented.
+#![allow(clippy::mem_replace_with_default, clippy::match_like_matches_macro)]
+
 #![doc(test(attr(deny(warnings), allow(dead_code, unused_assignments, unused_variables))))]
 
-#![doc(html_root_url = "https://docs.rs/futures-task/0.3.5")]
+#![doc(html_root_url = "https://docs.rs/futures-task/0.3.7")]
 
 #[cfg(all(feature = "cfg-target-has-atomic", not(feature = "unstable")))]
 compile_error!("The `cfg-target-has-atomic` feature requires the `unstable` feature as an explicit opt-in to unstable features");
diff --git a/src/waker.rs b/src/waker.rs
index 635bfe8..265a445 100644
--- a/src/waker.rs
+++ b/src/waker.rs
@@ -18,7 +18,7 @@
 /// [`ArcWake.wake()`](ArcWake::wake) if awoken.
 pub fn waker<W>(wake: Arc<W>) -> Waker
 where
-    W: ArcWake,
+    W: ArcWake + 'static,
 {
     let ptr = Arc::into_raw(wake) as *const ();