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