argh!
Merge branch 'master' of https://github.com/PTIPS/GTFS-tests.git
Verified PTIPS-3617