diff --git a/docs/configuration.asciidoc b/docs/configuration.asciidoc
index 021acad71..734ea379e 100644
--- a/docs/configuration.asciidoc
+++ b/docs/configuration.asciidoc
@@ -54,18 +54,21 @@ WARNING: This default will track the latest version of Elasticsearch, and is onl
 Default ::: `"1.3"`
 
 Options in node :::
+  * `"1.7"`
+  * `"1.6"`
+  * `"1.5"`
+  * `"1.4"`
   * `"1.3"`
   * `"1.2"`
   * `"1.1"`
   * `"1.0"`
   * `"0.90"`
   * `"master"` (unstable)
-  * `"1.x"` (unstable)
 
 Options in the browser :::
-  * `"1.3"`
-  * `"1.2"`
-  * `"1.1"`
+  * `"1.7"`
+  * `"1.6"`
+  * `"1.5"`
 
 
 
diff --git a/package.json b/package.json
index 3c2d8a8b5..c452c56bc 100644
--- a/package.json
+++ b/package.json
@@ -31,8 +31,7 @@
       "0.90"
     ],
     "unstable_es_branches": [
-      "master",
-      "1.x"
+      "master"
     ],
     "default_api_branch": "1.7"
   },
diff --git a/src/lib/apis/index.js b/src/lib/apis/index.js
index 82da865b0..550a174e7 100644
--- a/src/lib/apis/index.js
+++ b/src/lib/apis/index.js
@@ -1,6 +1,5 @@
 module.exports = {
   'master': require('./master'),
-  '1.x': require('./1_x'),
   '1.7': require('./1_7'),
   '1.6': require('./1_6'),
   '1.5': require('./1_5'),
diff --git a/src/lib/apis/master.js b/src/lib/apis/master.js
index d495ea58a..b4df0d28c 100644
--- a/src/lib/apis/master.js
+++ b/src/lib/apis/master.js
@@ -3744,6 +3744,66 @@ api.indices.prototype.segments = ca({
   ]
 });
 
+/**
+ * Perform a [indices.shardStores](http://www.elastic.co/guide/en/elasticsearch/reference/master/indices-shard-stores.html) request
+ *
+ * @param {Object} params - An object with parameters used to carry out this action
+ * @param {String, String[], Boolean} params.status - A comma-separated list of statuses used to filter on shards to get store information for
+ * @param {Boolean} params.ignoreUnavailable - Whether specified concrete indices should be ignored when unavailable (missing or closed)
+ * @param {Boolean} params.allowNoIndices - Whether to ignore if a wildcard indices expression resolves into no concrete indices. (This includes `_all` string or when no indices have been specified)
+ * @param {String} [params.expandWildcards=open] - Whether to expand wildcard expression to concrete indices that are open, closed or both.
+ * @param {Anything} params.operationThreading - TODO: ?
+ * @param {String, String[], Boolean} params.index - A comma-separated list of index names; use `_all` or empty string to perform the operation on all indices
+ */
+api.indices.prototype.shardStores = ca({
+  params: {
+    status: {
+      type: 'list',
+      options: [
+        'green',
+        'yellow',
+        'red',
+        'all'
+      ]
+    },
+    ignoreUnavailable: {
+      type: 'boolean',
+      name: 'ignore_unavailable'
+    },
+    allowNoIndices: {
+      type: 'boolean',
+      name: 'allow_no_indices'
+    },
+    expandWildcards: {
+      type: 'enum',
+      'default': 'open',
+      options: [
+        'open',
+        'closed',
+        'none',
+        'all'
+      ],
+      name: 'expand_wildcards'
+    },
+    operationThreading: {
+      name: 'operation_threading'
+    }
+  },
+  urls: [
+    {
+      fmt: '/<%=index%>/_shard_stores',
+      req: {
+        index: {
+          type: 'list'
+        }
+      }
+    },
+    {
+      fmt: '/_shard_stores'
+    }
+  ]
+});
+
 /**
  * Perform a [indices.stats](http://www.elastic.co/guide/en/elasticsearch/reference/master/indices-stats.html) request
  *