(cherry picked from commit d323c4eeedd835ce126579c6131a7919255b76c1)

Conflicts:

	modules/control/hotkeys.c
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>