This fixes #17495

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

SVN-Revision: 46746