Merge branch 'develop-v2.1.1' into 'issue-24'

# Conflicts:
#   ontology/saref4auto.ttl
2 jobs for issue-24
in 26 seconds, using 0 compute credits, and was queued for 15 seconds