Merge branch 'dev' into 'master'

CityDoctor Version 3.18.0

See merge request !37
2 jobs for 3.18.0 in 2 minutes and 31 seconds (queued for 1 second)
latest