online count fixes for cluster
Merge remote-tracking branch 'origin/cluster' into cluster

Conflicts:
	loader.js