Merge branch 'v0.6-a/keycodes-modes' into patched
Merge remote-tracking branch 'modes/v0.5/modes' into v0.6-a/keycodes-modes
regenerate patch file with