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

aves65: complete layout data (#13868)

add layout data for:
- LAYOUT_all
- LAYOUT_65_iso
- LAYOUT_65_iso_split_bs
- LAYOUT_65_iso_blocker_split_bs
- LAYOUT_65_ansi
- LAYOUT_65_ansi_split_bs
- LAYOUT_65_ansi_blocker
- LAYOUT_65_ansi_blocker_split_bs

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

4pplet/eagle_viper_rep/rev_a: fix missing key object (#13867)

Adds a key object for the KC_NUHS key to the info.json data.

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

[Keymap] Minor cleanup of bcat keymaps and userspace (#13224)

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

40percentclub/nori: fix matrix reference in LAYOUT_ortho_4x8 (#13866)

* 40percentclub/nori: fix matrix reference in LAYOUT_ortho_4x8

* remove ortho_4x8 from Community Layouts rule

ortho_4x8 isn't a valid option here.

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

capsunlocked/cu7: fix missing key object (#13862)

Adds a key object for the encoder keypress.

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

[Docs] Remove extra word it bootmagic page (#13855)

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

0xCB Static: fix `qmk info` and Configurator issues (#13856)

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

Function96 V2: Fixed info.json file (#13322)

Fixes the info.json data for the LAYOUT_default and LAYOUT_ansi_splitspace macros.

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

flash_stm32: don't unlock flash if already unlocked (#13841)

On stm32f4 after reboot from DFU it was observed that the flash is
already unlocked. In that case, attempting to unlock it again causes a
data abort.

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

Fix alignment of USB out report buffer 2 -> 4 (#13838)