Merge branch 'master' into 'dev'

Update dev

See merge request !9
1 job for dev_citygml3 in 1 minute and 14 seconds (queued for 1 second)