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

# Conflicts:
#   examples/MeterMeasurement.ttl
#   examples/WaterMeasurement.ttl
2 jobs for issue-3
in 49 seconds, using 0 compute credits, and was queued for 1 second