Merge branch 'master' into more_verbose_traci_error

8 jobs for more_verbose_traci_error in 147 minutes and 56 seconds (queued for 1 second)