Changes to fix NPEs when bundle changes.
Merge branch 'master' of https://github.com/camsys/onebusaway-nyc