No point in starting it at boot when we have no WAN yet
Merge remote-tracking branch 'upstream/master'