Handle the newly refactored minecarts.
Merge branch 'master' into sakura150