Remove noisy error messages, prepend "pathfinder: " to pathfinder messages
Merge commit 'ea0def3' into merge2