Update some NPCs, ref #1241
Merge pull request #1356 from EPuncker/master

Update some NPCs, ref #1241