Merge pull request #3072 from octo/ff/network_test