Water unwalkable, canMoveAll added
Merge branch 'refs/heads/CallebergBranch' into cbmerge