Comment out ped_obstacles flavor in the local_settings template
Merge branch 'master' into ourmiami