Merge pull request #1603 from rubenk/tcpconns-make-variable-static