Made Locomotive detection much, much better
Merge remote-tracking branch 'origin/master'