Fixing the crash with villages - hopefully.
Merge remote-tracking branch 'origin/master'