Commit 055f0cde authored by David Blyth's avatar David Blyth

Merge branch 'master' into 'ci_cleanup'

# Conflicts:
#   .gitlab-ci.yml
parents d7a82f71 bd3c5637
Pipeline #27 passed with stages
in 2 seconds