diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3ff4bf5e2fb..28127c497f4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## Bug fixes
 
+* **Gzip**: Fixed crash when gzip was enabled [#8380](https://github.com/grafana/grafana/issues/8380)
 * **Graphite**: Fixed issue with Toggle edit mode did in query editor [#8377](https://github.com/grafana/grafana/issues/8377)
 * **Alerting**: Fixed issue with state history not showing query execution errors [#8412](https://github.com/grafana/grafana/issues/8412)
 * **Alerting**: Fixed issue with missing state history events/annotations when using sqlite3 database [#7992](https://github.com/grafana/grafana/issues/7992)
diff --git a/public/app/plugins/datasource/mysql/partials/config.html b/public/app/plugins/datasource/mysql/partials/config.html
index 4bdbd923bad..cf153a125bf 100644
--- a/public/app/plugins/datasource/mysql/partials/config.html
+++ b/public/app/plugins/datasource/mysql/partials/config.html
@@ -28,7 +28,7 @@
 	<div class="grafana-info-box">
 		<h5>User Permission</h5>
 		<p>
-			The database user should only be granted SELECT permissions on the specified database & tables you want to query.
+			The database user should only be granted SELECT permissions on the specified database &amp; tables you want to query.
 			Grafana does not validate that queries are safe so queries can contain any SQL statement. For example, statements
 			like <code>USE otherdb;</code> and <code>DROP TABLE user;</code> would be executed. To protect against this we
 			<strong>Highly</strong> recommmend you create a specific MySQL user with restricted permissions.
diff --git a/vendor/github.com/go-macaron/gzip/.travis.yml b/vendor/github.com/go-macaron/gzip/.travis.yml
deleted file mode 100644
index 2774fb35d50..00000000000
--- a/vendor/github.com/go-macaron/gzip/.travis.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-sudo: false
-language: go
-
-go:
-  - 1.3
-  - 1.4
-  - 1.5
-  - tip
-
-script: go test -v -cover -race
-
-notifications:
-  email:
-    - u@gogs.io
diff --git a/vendor/github.com/go-macaron/gzip/gzip.go b/vendor/github.com/go-macaron/gzip/gzip.go
index ca54ec67d32..296c0e38b3f 100644
--- a/vendor/github.com/go-macaron/gzip/gzip.go
+++ b/vendor/github.com/go-macaron/gzip/gzip.go
@@ -86,7 +86,10 @@ func Gziper(options ...Options) macaron.Handler {
 		gzw := gzipResponseWriter{gz, ctx.Resp}
 		ctx.Resp = gzw
 		ctx.MapTo(gzw, (*http.ResponseWriter)(nil))
-		if ctx.Render != nil {
+
+		// Check if render middleware has been registered,
+		// if yes, we need to modify ResponseWriter for it as well.
+		if _, ok := ctx.Render.(*macaron.DummyRender); !ok {
 			ctx.Render.SetResponseWriter(gzw)
 		}
 
diff --git a/vendor/vendor.json b/vendor/vendor.json
index 9d80bd38f84..75adf575b15 100644
--- a/vendor/vendor.json
+++ b/vendor/vendor.json
@@ -370,6 +370,12 @@
 			"revision": "48920167fa152d02f228cfbece7e0f1e452d200a",
 			"revisionTime": "2016-12-22T07:05:54Z"
 		},
+		{
+			"checksumSHA1": "Rp4MJ0xFAy00EC0zlnwCpTEdYY8=",
+			"path": "github.com/go-macaron/gzip",
+			"revision": "cad1c6580a07c56f5f6bc52d66002a05985c5854",
+			"revisionTime": "2016-02-22T04:36:47Z"
+		},
 		{
 			"checksumSHA1": "y0olVbiMQ6/UOa/eh52XYnies90=",
 			"path": "github.com/go-macaron/inject",