manuell merge pathfinder master
Worldbuilder
Merge remote-tracking branch 'origin/master' into CallebergBranch