fixed master server lookup for servers. #1047
Merge remote-tracking branch 'upstream/0.6' into 0.6-android