Add some more debug to see why CD isn't working.
Calm down the logging again.
Merge branch 'master' into prefix-stack