Merge branch 'fixnginx' into 'next'

Fixed nginx proxy_pass directive

See merge request famedly/conduit!589

DEPLOY.md

@@ -279,7 +279,7 @@ server {
     client_max_body_size 20M;
 
     location /_matrix/ {
-        proxy_pass http://127.0.0.1:6167$request_uri;
+        proxy_pass http://127.0.0.1:6167;
         proxy_set_header Host $http_host;
         proxy_buffering off;
         proxy_read_timeout 5m;