fix int multiplication overflow
Merge branch 'master' into mbta