merged 2eec47b9ed78250b2a6f5ca984726c34c65ee378 from nore
Fix a crash with village types
Re-fix another crash