Merge pull request #2896 from awakecoding/master
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Fri, 18 Sep 2015 15:57:01 +0000 (11:57 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Fri, 18 Sep 2015 15:57:01 +0000 (11:57 -0400)
Win32 Gateway Fix, iOS TCP connection infinite loop fix


Trivial merge