Switch from QuickParseUtil
Merge branch 'master' into mbta