Merge commit 'e0f5a86e8bcf9e669b57cbacc20271db66b603d1' into ao-0.11.x
Merge branch 'ao-0.11.x' of https://github.com/AccessibilityObservatory/OpenTripPlanner into ao-0.11.x