Fix #618 - Use X_FORWARDED_FOR when applicable for tracking