Merge branch 'metrics' into 'develop'

Account for gunicorn proxy when getting ip address

See merge request !77
3 jobs for develop in 1 minute and 3 seconds (queued for 1 second)