Merge remote-tracking branch 'zergin/fix-http-x-forwarded-for'