Fix ConcurrentModificationException while being idle kicked in a vehicle
Move replace-commands to commands.replace-commands
Upstream merge
Merge remote-tracking branch 'upstream/master'