Merge remote-tracking branch 'upstream/dev' into rak-ethernet

# Conflicts:
#	docs/faq.md

examples/companion_radio/main.cpp

@@ -234,6 +234,10 @@ void setup() {
 
   sensors.begin();
 
+#if ENV_INCLUDE_GPS == 1
+  the_mesh.applyGpsPrefs();
+#endif
+
 #ifdef DISPLAY_CLASS
   ui_task.begin(disp, &sensors, the_mesh.getNodePrefs());  // still want to pass this in as dependency, as prefs might be moved
 #endif