Commit bdadf576 by Richard Smith-Unna

Merge branch 'master' into 'master'

Various minor changes

See merge request !2
parents 314b5b7e a2374fdf
Pipeline #1681 failed with stage
in 0 seconds