From 8b3d0536a01f6960f027d838cb1de56c49b30d61 Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Mon, 16 Nov 2015 16:39:48 -0500
Subject: [PATCH] 0.11.4

---
 CHANGELOG.md         | 6 ++++++
 README.md            | 4 ++--
 _config.mb-pages.yml | 2 +-
 _config.yml          | 2 +-
 bench/fps/site.js    | 4 ++--
 package.json         | 2 +-
 6 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 00d15d41bca..614940499d4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 An in-progress version being developed in the `master` branch.
 
+## 0.11.4 (Nov 16 2015)
+
+#### Bugfixes
+
+* Fix alpha blending of alpha layers  (#1684)
+
 ## 0.11.3 (Nov 10 2015)
 
 #### Bugfixes
diff --git a/README.md b/README.md
index 00262ec9135..7fa1d13229a 100644
--- a/README.md
+++ b/README.md
@@ -7,8 +7,8 @@ A WebGL JavaScript interactive maps library that can render [Mapbox Vector Tiles
 Include the source via HTML tags:
 
 ```html
-<script src='https://api.tiles.mapbox.com/mapbox-gl-js/v0.11.3/mapbox-gl.js'></script>
-<link href='https://api.tiles.mapbox.com/mapbox-gl-js/v0.11.3/mapbox-gl.css' rel='stylesheet' />
+<script src='https://api.tiles.mapbox.com/mapbox-gl-js/v0.11.4/mapbox-gl.js'></script>
+<link href='https://api.tiles.mapbox.com/mapbox-gl-js/v0.11.4/mapbox-gl.css' rel='stylesheet' />
 ```
 
 For more information, see the [API documentation](https://www.mapbox.com/mapbox-gl-js/api/) and [examples](https://www.mapbox.com/mapbox-gl-js/examples/).
diff --git a/_config.mb-pages.yml b/_config.mb-pages.yml
index c0359816895..afd7666ce3e 100755
--- a/_config.mb-pages.yml
+++ b/_config.mb-pages.yml
@@ -6,7 +6,7 @@ permalink: /:categories/:title
 baseurl: /mapbox-gl-js
 highlighter: pygments
 excerpt_separator: ""
-version: v0.11.3
+version: v0.11.4
 rdiscount:
   extensions: [smart]
 exclude: [dist]
diff --git a/_config.yml b/_config.yml
index 82dfdbebaac..d307c66bc29 100755
--- a/_config.yml
+++ b/_config.yml
@@ -6,7 +6,7 @@ permalink: /:categories/:title
 baseurl: /mapbox-gl-js
 highlighter: pygments
 excerpt_separator: ""
-version: v0.11.3
+version: v0.11.4
 mapboxglbase: /mapbox-gl-js/dist
 rdiscount:
   extensions: [smart]
diff --git a/bench/fps/site.js b/bench/fps/site.js
index 271b3070a07..48c93ea4986 100644
--- a/bench/fps/site.js
+++ b/bench/fps/site.js
@@ -1,9 +1,9 @@
 var urls = [
     'https://api.tiles.mapbox.com/mapbox-gl-js/v0.10.0/mapbox-gl.js',
-    'https://api.tiles.mapbox.com/mapbox-gl-js/v0.11.3/mapbox-gl.js',
+    'https://api.tiles.mapbox.com/mapbox-gl-js/v0.11.4/mapbox-gl.js',
     '/dist/mapbox-gl.js',
     'https://api.tiles.mapbox.com/mapbox-gl-js/v0.10.0/mapbox-gl.js',
-    'https://api.tiles.mapbox.com/mapbox-gl-js/v0.11.3/mapbox-gl.js',
+    'https://api.tiles.mapbox.com/mapbox-gl-js/v0.11.4/mapbox-gl.js',
     '/dist/mapbox-gl.js'
 ];
 
diff --git a/package.json b/package.json
index 3a24cf34362..017b18184ae 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "mapbox-gl",
   "description": "A WebGL interactive maps library",
-  "version": "0.11.3",
+  "version": "0.11.4",
   "main": "js/mapbox-gl.js",
   "license": "BSD-3-Clause",
   "repository": {