Merge branch 'beta' into 'master'

Various fixes

See merge request !133
3 jobs for v1.0.2 in 11 minutes and 53 seconds (queued for 2 seconds)
latest