Merge branch 'master' into add_traci_cmds

8 jobs for add_traci_cmds in 122 minutes and 49 seconds (queued for 2 seconds)