merge v1.1.3 - Fixed bug in which teleport can silently fail