fix problems with proxy handling. Change method name to a  meaningful one
Merge pull request #3997 from spigad/proxy

fix problems with proxy handling. Change method name to a  meaningful on...