Fix trac issue #5957. (cherry picked from commit 427a47abcd) Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
427a47abcd