Merge branch 'master' into 'beta'

updated some out of date stuff

See merge request !112
3 jobs for beta in 6 minutes and 58 seconds (queued for 2 seconds)