Merge remote-tracking branch 'origin/master' into develop

keyboards/40percentclub/polyandry/info.json

@@ -9,7 +9,7 @@
         "device_version": "0.0.1"
     },
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_ortho_4x3": {
             "layout": [
                 {"label": "k000", "x": 0, "y": 0},
                 {"label": "k001", "x": 1, "y": 0},

keyboards/40percentclub/polyandry/keymaps/default/keymap.c

@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-	LAYOUT(
+	LAYOUT_ortho_4x3(
 		KC_1, KC_2, KC_3, 
 		KC_4, KC_5, KC_6, 
 		KC_7, KC_8, KC_9, 

keyboards/40percentclub/polyandry/promicro/promicro.h

@@ -17,7 +17,7 @@
 
 #include "polyandry.h"
 
-#define LAYOUT( \
+#define LAYOUT_ortho_4x3( \
 	K000, K001, K002, \
  	K003, K004, K005, \
 	K006, K007, K008, \

keyboards/40percentclub/polyandry/teensy2/teensy2.h

@@ -22,7 +22,7 @@
 
 #include "polyandry.h"
 
-#define LAYOUT( \
+#define LAYOUT_ortho_4x3( \
 	K000, K001, K002, \
  	K003, K004, K005, \
 	K006, K007, K008, \