Improved rendering of buses based on approaching flag
Merge remote-tracking branch 'origin/master'