CONTRIB-4605

Signed-off-by: Joseph Rézeau <moodle@rezeau.org>