Merge remote-tracking branch 'original/incoming' into incoming

Conflicts:
	src/libstd/json.rs
	src/libstd/sort.rs

1 files changed, 1 insertions, 1 deletions

diff --git a/src/rt/rust.cpp b/src/rt/rust.cpp
index dc28f624415..11e65347f11 100644
--- a/src/rt/rust.cpp
+++ b/src/rt/rust.cpp
@@ -86,7 +86,7 @@ rust_start(uintptr_t main_fn, int argc, char **argv, void* crate_map) {
     // Load runtime configuration options from the environment.
     // FIXME #1497: Should provide a way to get these from the command
     // line as well.
-    rust_env *env = load_env();
+    rust_env *env = load_env(argc, argv);
 
     global_crate_map = crate_map;