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

[Keyboard] Add Mojo68 for Melgeek (#13578)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>

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

[Keyboard] Add Emi20  (#13603)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>

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

[Keyboard] add cherryb studio cb1800 keyboard (#13639)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>

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

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

[Keyboard] Add X-Bows Ranger Keyboard (#13660)

Co-authored-by: Ryan <fauxpark@gmail.com>

[Keymap] Jonavin keymap Mercutio add win key lockout function (#13670)

Co-authored-by: Jonavin <=>

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

[Keyboard] Add halfcliff keyboard (#13515)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>

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

[Keyboard] Add GetawayVan (#13412)

Co-authored-by: Ryan <fauxpark@gmail.com>

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

[Keyboard] Added Orthocode keyboard (#13487)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>

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

Fix unit tests after recent refactor (#13765)

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

Allison Numpad: Configurator fix for LAYOUT_numpad_6x4 (#13759)

* info.json: human-friendly formatting

- one key object per line; line breaks between physical rows
- four-space indent
- remove trailing whitespace

* info.json: correct key object order for LAYOUT_numpad_6x4