Merge branch 'patch-1' into 'master'

Update author list

See merge request !70
3 jobs for master in 40 seconds (queued for 1 second)