Merge branch '193-final-differe' into 'master'

193 final differe

See merge request jprivat/INF1070!47
2 jobs for master in 4 minutes and 49 seconds (queued for 2 minutes and 51 seconds)