Merge branch 'dev' into 'master'

CityDoctor Version 3.18.2

See merge request !40
1 job for 120-portierung-sweep-algorithmen in 2 minutes and 4 seconds (queued for 3 seconds)