Thid candidate fix for https://github.com/evennia/evennia/issues/2039\#issue-555828740
Thid candidate fix for https://github.com/evennia/evennia/issues/2039\#issue-555828740

jamesbeebop/evennia,jamesbeebop/evennia,jamesbeebop/evennia