Fix for OBANYC-1907 and OBANYC-1790
Merge branch 'master' of github.com:camsys/onebusaway-nyc