Hide block boundaries in debug
chg: use better names for stats
Merge remote-tracking branch 'origin/stable'

Conflicts:
	src/client.cpp