Fix for villagers running indoors at super-speed on multiplayer
Merge remote-tracking branch 'origin/4.0.4CM' into 4.1.0