Merge branch 'master' into wasmtime-real

# Conflicts:
#	node/cli/Cargo.toml

core/service/Cargo.toml

@@ -9,6 +9,9 @@ default = ["rocksdb"]
 # The RocksDB feature activates the RocksDB database backend. If it is not activated, and you pass
 # a path to a database, an error will be produced at runtime.
 rocksdb = ["client_db/kvdb-rocksdb"]
+wasmtime = [
+    "substrate-executor/wasmtime",
+]
 
 [dependencies]
 derive_more = "0.15.0"
@@ -54,8 +57,3 @@ babe-primitives = { package = "substrate-consensus-babe-primitives", path = "../
 grandpa = { package = "substrate-finality-grandpa", path = "../../core/finality-grandpa" }
 grandpa-primitives = { package = "substrate-finality-grandpa-primitives", path = "../../core/finality-grandpa/primitives" }
 tokio = "0.1"
-
-[features]
-wasmtime = [
-    "substrate-executor/wasmtime",
-]

node/cli/Cargo.toml

@@ -95,8 +95,30 @@ structopt = "0.3.3"
 vergen = "3.0.4"
 
 [features]
+default = ["cli"]
+browser = [
+	"clear_on_drop",
+	"console_error_panic_hook",
+	"console_log",
+	"js-sys",
+	"libp2p",
+	"wasm-bindgen",
+	"wasm-bindgen-futures",
+	"kvdb-memorydb",
+	"rand/wasm-bindgen",
+	"rand6"
+]
+cli = [
+	"substrate-cli",
+	"transaction-factory",
+	"tokio",
+	"exit-future",
+	"ctrlc",
+	"substrate-service/rocksdb"
+]
 wasmtime = [
-    "cli/wasmtime",
+	"cli",
     "node-executor/wasmtime",
+    "substrate-cli/wasmtime",
     "substrate-service/wasmtime",
 ]