Merge remote-tracking branch 'origin/unstable' into tree-states

beacon_node/src/cli.rs

@@ -530,6 +530,16 @@ pub fn cli_app<'a, 'b>() -> App<'a, 'b> {
                        [default: 1]. You may change the compression level freely without re-syncing.")
                 .takes_value(true)
         )
+        .arg(
+            Arg::with_name("prune-payloads")
+                .long("prune-payloads")
+                .help("Prune execution payloads from Lighthouse's database. This saves space but \
+                       imposes load on the execution client, as payloads need to be \
+                       reconstructed and sent to syncing peers.")
+                .takes_value(true)
+                .default_value("true")
+        )
+
         /*
          * Misc.
          */