Let generate tools be used by Python 2 for now. Fix duplicate stops
Merge branch 'master' into toronto