Merge branch 'master' into 'beta'

Typos and fixes into beta

See merge request !99
3 jobs for beta in 3 minutes and 1 second (queued for 51 seconds)