(cherry picked from commit d323c4ee)

Conflicts:

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