diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 11c860d95..66f9f9ce8 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -23,9 +23,7 @@ The process for contributing to any of the Elasticsearch repositories is similar
       ```sh
       npm install -g grunt-cli
       ```
-    3. Run the tests This will lint the code, run the unit tests, install local versions of elasticsearch, and run the integration tests using those installations.
-
-      ***WARNING***: If you are running Elasticsearch on your machine, and it is using port 9200, shut it down.
+    3. Run the tests. Testing the code will lint the project, run the unit tests, install local versions of elasticsearch, and run the integration tests using those installations.
 
       ```sh
       grunt test
diff --git a/docs/api_methods.asciidoc b/docs/api_methods.asciidoc
index 41f5e9e14..741409542 100644
--- a/docs/api_methods.asciidoc
+++ b/docs/api_methods.asciidoc
@@ -2311,6 +2311,8 @@ The default method is `GET` and the usual <<api-conventions,params and return va
 `Boolean` -- Return local information, do not retrieve the state from master node (default: false)
 `masterTimeout`::
 `Date, Number` -- Specify timeout for connection to master
+`indexTemplates`::
+`String, String[], Boolean` -- A comma separated list to return specific index templates when returning metadata
 `flatSettings`::
 `Boolean` -- Return settings in flat format (default: false)
 `index`::
diff --git a/src/elasticsearch b/src/elasticsearch
index 0a9713475..95bf091dd 160000
--- a/src/elasticsearch
+++ b/src/elasticsearch
@@ -1 +1 @@
-Subproject commit 0a9713475763106a7a9c525e4f940ecc3e7ee84d
+Subproject commit 95bf091dd60ea41f2e269425433481986101035e
diff --git a/src/lib/api.js b/src/lib/api.js
index 7411f472d..5da5d6d6b 100644
--- a/src/lib/api.js
+++ b/src/lib/api.js
@@ -767,6 +767,7 @@ api.cluster.prototype.reroute = ca({
  * @param {Object} params - An object with parameters used to carry out this action
  * @param {Boolean} params.local - Return local information, do not retrieve the state from master node (default: false)
  * @param {Date, Number} params.masterTimeout - Specify timeout for connection to master
+ * @param {String, String[], Boolean} params.indexTemplates - A comma separated list to return specific index templates when returning metadata
  * @param {Boolean} params.flatSettings - Return settings in flat format (default: false)
  * @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
  * @param {String, String[], Boolean} params.metric - Limit the information returned to the specified metrics
@@ -780,6 +781,10 @@ api.cluster.prototype.state = ca({
       type: 'time',
       name: 'master_timeout'
     },
+    indexTemplates: {
+      type: 'list',
+      name: 'index_templates'
+    },
     flatSettings: {
       type: 'boolean',
       name: 'flat_settings'
@@ -794,7 +799,6 @@ api.cluster.prototype.state = ca({
           options: [
             '_all',
             'blocks',
-            'index_templates',
             'metadata',
             'nodes',
             'routing_table'
@@ -813,7 +817,6 @@ api.cluster.prototype.state = ca({
           options: [
             '_all',
             'blocks',
-            'index_templates',
             'metadata',
             'nodes',
             'routing_table'