adjusted message when reaching border with teleport
Merge branch 'master' into stable