Merge branch 'master' into update_deps

Author: JohnTitor

Cargo.toml

@@ -37,9 +37,6 @@ rustc-serialize = { version = "0.3", optional = true }
 # Optionally demangle C++ frames' symbols in backtraces.
 cpp_demangle = { default-features = false, version = "0.4.0", optional = true, features = ["alloc"] }
 
-
-# Optional dependencies enabled through the `gimli-symbolize` feature, do not
-# use these features directly.
 addr2line = { version = "0.19.0", default-features = false }
 miniz_oxide = { version = "0.6.0", default-features = false }
 
@@ -61,7 +58,7 @@ dylib-dep = { path = "crates/dylib-dep" }
 libloading = "0.7"
 
 [features]
-# By default libstd support and gimli-symbolize is used to symbolize addresses.
+# By default libstd support is enabled.
 default = ["std"]
 
 # Include std support. This enables types like `Backtrace`.