Re-enable option to skip linking of stops to parent stops
Merge pull request #1239 from goabout/fix_tests

Fix tests