Merge pull request #1304 from slluis/mac-proxy-autoconfig