fix proxy
Merge remote-tracking branch 'upstream/master'
Merge pull request #883 from patriot1burke/master

proxy fixes