Merge remote-tracking branch 'upstream/dev' into led-manager

# Conflicts:
#	src/helpers/CommonCLI.cpp

src/MeshCore.h

@@ -17,6 +17,7 @@
 #define PATH_HASH_SIZE       1
 
 #define MAX_PACKET_PAYLOAD  184
+#define MAX_GROUP_DATA_LENGTH  (MAX_PACKET_PAYLOAD - CIPHER_BLOCK_SIZE - 3)
 #define MAX_PATH_SIZE        64
 #define MAX_TRANS_UNIT      255
 
@@ -104,4 +105,4 @@ public:
   }
 };
 
-}
+}