Merge branch 'issue-27' into 'issue-29'

# Conflicts:
#   ontology/saref4auto.ttl
2 jobs for issue-29
in 23 seconds, using 0 compute credits, and was queued for 8 seconds