Added back in the character who owns the inventory.
Merge remote-tracking branch 'origin/master'