Merge remote-tracking branch 'origin/release-4.8' into t0merge48master

2018-03-15 14:30:57 -04:00
--- a/utils/api.go
+++ b/utils/api.go
@@ -59,6 +59,7 @@ func RenderWebError(w http.ResponseWriter, r *http.Request, status int, params u
 		return
 	}

+	w.Header().Set("Content-Type", "text/html")
 	w.WriteHeader(status)
 	fmt.Fprintln(w, `<!DOCTYPE html><html><head></head>`)
 	fmt.Fprintln(w, `<body onload="window.location = '`+template.HTMLEscapeString(template.JSEscapeString(destination))+`'">`)