Merge branch 'master' into master

mesh.options

@@ -38,3 +38,6 @@
 # MyMessage.name         max_size:40 
 # or fixed_length or fixed_count, or max_count
 
+*MyNodeInfo.air_period_tx       max_count:24
+*MyNodeInfo.air_period_rx       max_count:24
+# *MyNodeInfo.air_period_rx_all   max_count:12

mesh.proto

@@ -962,12 +962,6 @@ message MyNodeInfo {
    */
   repeated uint32 air_period_rx = 17;
 
-  /*
-   *  48 time windows of 1hr each with the airtime of valid lora packets. This includes
-   *  packets that doesn't belong to your mesh.
-   */
-  repeated uint32 air_period_rx_all = 18;
-
   /*
    * FIXME - add more useful debugging state (queue depths etc)
    */