Merge branch 'devel' into release-1.7

packages/meteor/server_environment.js

@@ -24,7 +24,7 @@ if (process.env.METEOR_SETTINGS) {
   try {
     Meteor.settings = JSON.parse(process.env.METEOR_SETTINGS);
   } catch (e) {
-    throw new Error("METEOR_SETTINGS are not valid JSON: " + process.env.METEOR_SETTINGS);
+    throw new Error("METEOR_SETTINGS are not valid JSON.");
   }
 }
 

packages/tracker/package.js

@@ -7,6 +7,7 @@ Package.onUse(function (api) {
   api.use("ecmascript");
   api.addFiles("tracker.js");
   api.export("Tracker");
+  api.export("Deps");
 });
 
 Package.onTest(function (api) {

packages/tracker/tracker.js

@@ -8,6 +8,12 @@
  */
 Tracker = {};
 
+/**
+ * @namespace Deps
+ * @deprecated
+ */
+Deps = Tracker;
+
 // http://docs.meteor.com/#tracker_active
 
 /**