Merge branch 'master' into obanyc-compat
Merge branch 'obanyc-compat' of https://github.com/kurtraschke/onebusaway-application-modules into obanyc-compat