Merge remote-tracking branch 'upstream/master'

Procfile

@@ -1 +1 @@
-web: gunicorn httpbin:app
+web: gunicorn httpbin:app -w 6

httpbin/core.py

@@ -80,7 +80,7 @@ def view_deny_page():
 def view_origin():
     """Returns Origin IP."""
 
-    return jsonify(origin=request.remote_addr)
+    return jsonify(origin=request.headers.get('X-Forwarded-For', request.remote_addr))
 
 
 @app.route('/headers')

httpbin/helpers.py

@@ -143,7 +143,7 @@ def get_dict(*keys, **extras):
         args=request.args,
         form=form,
         data=json_safe(data),
-        origin=request.remote_addr,
+        origin=request.headers.get('X-Forwarded-For', request.remote_addr),
         headers=get_headers(),
         files=get_files(),
         json=_json

runtime.txt

@@ -1 +0,0 @@
-python-2.7.3