This fixes #20409 Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> SVN-Revision: 47352
This is already applied in Daniel's ("upstream") tree and thus will be part of upcoming version(s). SVN-Revision: 45898