(cherry picked from commit 31d64379a5706513ee6ed4e440c9e723a9842c9e)
Signed-off-by: Jean-Paul Saman <jean-paul.saman@m2x.nl>