Add proxy support for connections
Path fix
Merge remote-tracking branch 'proxy_support/master'

Conflicts:
	test/unit/connection_test.rb