testing server side network capabilities
Merge remote-tracking branch 'origin/master'