Add support to HTTP proxy, fix issue #22
Merge branch 'm13253-stable' into develop
* Fix #22