590: Merge pull request #344 from OneBusAway/develop

Merge 2.3.1 into master