Merge branch 'master' into coderkun_neo2

diff --cc keyboards/ergodox/keymaps/coderkun_neo2/keymap.c
index 9b33bbd,aaf75d5..ff6d38f
--- 1/keyboards/ergodox/keymaps/coderkun_neo2/keymap.c
--- 2/keyboards/ergodox/keymaps/coderkun_neo2/keymap.c
+++ b/keyboards/ergodox/keymaps/coderkun_neo2/keymap.c
@@@ -311,8 -312,8 +311,10 @@@ uint16_t hex_to_keycode(uint8_t hex
          return NEO_E;
        case 0xF:
          return NEO_F;
+       default:
+         return KC_NO;
      }
    }
 +
 +  return KC_1 + (hex - 0x1);
  }