udf: Check for fwdproxy-config, not fwdproxy
Merge remote-tracking branch 'origin/master' into mac