Added support for CF-Connecting-IP:, which is more reliable in CloudFlare than X-Forwarded-For:
auto-merge staging into master