Be a bit better about logging data as it's read.
Merge remote-tracking branch 'origin/master' into freebsd10