Merge pull request #1027 from Kinematics/4.1-dev

4.1 dev
Update for new Trust NPCs.