Backmerge 0.3.0

### Changelog
* Fix a single breaking unit test, due to `network_util` API changing after #922.
* Bump version to `0.3.1.dev0` so that nodes running `develop` can be distinguished.