Ref #10, squelch entity on another map error
Merge branch 'bugfix/10-entity-another-map' into develop