merge with master

Cargo.lock

@@ -228,6 +228,17 @@ dependencies = [
  "winapi 0.3.8",
 ]
 
+[[package]]
+name = "hostname"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867"
+dependencies = [
+ "libc",
+ "match_cfg",
+ "winapi 0.3.8",
+]
+
 [[package]]
 name = "indexmap"
 version = "1.3.2"
@@ -310,6 +321,12 @@ dependencies = [
  "cfg-if",
 ]
 
+[[package]]
+name = "match_cfg"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4"
+
 [[package]]
 name = "maybe-uninit"
 version = "2.0.0"
@@ -627,6 +644,7 @@ dependencies = [
  "divrem",
  "downcast",
  "git-version",
+ "hostname",
  "indexmap",
  "lazy_static",
  "libc",