Merge branch 'master' into 'contributor-page'

Master

See merge request !36
4 jobs for contributor-page in 43 minutes and 59 seconds (queued for 4 seconds)
latest