Disable some debug logging
Merge branch 'master' into pluggable-fs