Commit 55f55325 authored by Walter Featherstone's avatar Walter Featherstone

Merge branch 'develop' into 'develop_2.1.1'

# Conflicts:
#   README.md
parents 04cda9c9 e5c689b7
Pipeline #2128 passed with stage
in 0 seconds