quick hack to fix persist-remote-ip
Fix connecting to localhost
Merge commit 'feb8fdb7dfbee91e5e2081badb985f4b4a3f7a93' into android_2.3rc1+ds
Fix connecting to UDP