proxy config 2
Merge remote-tracking branch 'upstream/master'
Merge pull request #868 from patriot1burke/master

proxy config