Signed-off-by: Rémi Denis-Courmont <rdenis@simphalempin.com>
(cherry picked from commit 51d3696e)

Conflicts:

	modules/control/telnet.c