Merge branch 'dev' into 'master'

CityDoctor Release Version 3.16.0

See merge request !11
1 job for master in 1 minute and 25 seconds