Merge branch 'matthieu.gobin-master-patch-55947' into 'master'

Updated the title, fixed some issues in the authors.

See merge request !90
3 jobs for master in 59 seconds (queued for 1 second)