Merge remote-tracking branch 'upstream/dev' into keymindCascade

# Conflicts:
#	examples/simple_repeater/MyMesh.cpp

examples/simple_repeater/MyMesh.cpp

@@ -59,7 +59,7 @@ extern "C" caddr_t _sbrk(int increment);
   #define DEFAULT_PATH_HASH_MODE 0
 #endif
 #ifndef DEFAULT_LOOP_DETECT
-  #define DEFAULT_LOOP_DETECT LOOP_DETECT_OFF
+  #define DEFAULT_LOOP_DETECT LOOP_DETECT_MINIMAL
 #endif
 
 #ifndef ADVERT_NAME
@@ -786,7 +786,7 @@ int MyMesh::handleRequest(ClientInfo *sender, uint32_t sender_timestamp, uint8_t
       int results_offset = 0;
       uint8_t results_buffer[130];
       for(int index = 0; index < count && index + offset < neighbours_count; index++){
-        
+
         // stop if we can't fit another entry in results
         int entry_size = pubkey_prefix_length + 4 + 1;
         if(results_offset + entry_size > sizeof(results_buffer)){
@@ -9528,7 +9528,7 @@ void MyMesh::formatRadioDiagReply(char *reply) {
 }
 
 void MyMesh::formatPacketStatsReply(char *reply) {
-  StatsFormatHelper::formatPacketStats(reply, radio_driver, getNumSentFlood(), getNumSentDirect(), 
+  StatsFormatHelper::formatPacketStats(reply, radio_driver, getNumSentFlood(), getNumSentDirect(),
                                        getNumRecvFlood(), getNumRecvDirect());
 }