Merge pull request #4264
cb7a3ed remove dup of extern int nConnectTimeout; in netbase (Philip Kaufmann)