Use labyrinth strategy for swamp
Merge branch 'master' into ownthread