Merge branch 'master' into master

diff --cc Boards.h
Simple merge

diff --cc Makefile
Simple merge

diff --cc RNode_Firmware.ino
index 2fa93d3c44cf15880c38aae681e696e95e7c9812,db0605a726075df06f8d46030d5d67eadf2b5fb1..4410a91b7a20e3b18a911b6b332b53029039908e
--- 1/RNode_Firmware.ino
--- 2/RNode_Firmware.ino
+++ b/RNode_Firmware.ino
@@@ -77,12 -77,8 +77,13 @@@ void setup() 
    fifo_init(&serialFIFO, serialBuffer, CONFIG_UART_BUFFER_SIZE);
  
    Serial.begin(serial_baudrate);
-   #if BOARD_MODEL != BOARD_RAK4631
 -  #if BOARD_MODEL != BOARD_RNODE_NG_22
++
++  #if BOARD_MODEL != BOARD_RAK4631 && BOARD_MODEL != BOARD_RNODE_NG_22
 +  // Some boards need to wait until the hardware UART is set up before booting
 +  // the full firmware. In the case of the RAK4631, the line below will wait
 +  // until a serial connection is actually established with a master. Thus, it
 +  // is disabled on this platform.
-   while (!Serial);
+     while (!Serial);
    #endif
  
    serial_interrupt_init();