every 128k queries
Merge branch 'master' into diagnostics
fixup
Merge branch 'diagnostics' into scoped_malloc

Conflicts:
	portability/memory.cc