A start on fixing #994
Merge pull request #1013 from stefanbeller/master

A start on fixing #994
Fix npc loading based on status
Merge pull request #1031 from igorko/master

Fix npc loading based on status
Merge remote-tracking branch 'upstream/master'