Improved approach detection for buses
Merge remote-tracking branch 'origin/master'