Teleportating Markers
Merged.
Merge branch 'sz'