Add network-uri explicitly to build dependencies.
Merge branch 'master' into sodium_frp_spike
Work in progress... This doesn't compile yet.