Merge branch 'master' into fix-resolutions-save

This reverts commit 1e2c27f338.

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]);
     }

lib/core/resolverFactory.js

@@ -176,6 +176,12 @@ function getConstructor(decEndpoint, options, registryClient) {
 
     // Check if is a shorthand and expand it
     addResolver(function () {
+
+        // Check if the shorthandResolver is falsy
+        if (!config.shorthandResolver) {
+            return;
+        }
+
         // Skip ssh and/or URL with auth
         if (/[:@]/.test(source)) {
             return;