Small change for network stuff.
Merge branch 'release/1.0.2b'