Commit a854fe83 authored by David Morley's avatar David Morley

Merge branch 'master' into 'develop'

# Conflicts:
#   composer.lock
parents db7b36aa f17c663b
Pipeline #527 passed with stage
in 1 minute and 30 seconds