Merge branch 'small_changes' into 'master'

Miscellaneous, small changes

See merge request !30
8 jobs for master in 2 minutes and 35 seconds (queued for 7 seconds)
latest