Fixed: Stats list may show too few or too many stats (bug#10110).

Conflicts:
	CHANGES.md
Merge remote-tracking branch 'upstream/master'