FIX: Skip multiple substation distribution code where there is only one substation in a city.
Merge branch '11.x' into devel-new