Merge branch 'master' into fix-resolutions-save

lib/core/Manager.js

@@ -825,7 +825,9 @@ Manager.prototype._electSuitable = function (name, semvers, nonSemvers) {
         });
 
         // Save resolution
-        this._storeResolution(picks[suitable]);
+        if (this._config.argv.cooked.includes('--save')) {
+          this._storeResolution(picks[suitable]);
+        }
 
         return Q.resolve(picks[suitable]);
     }