Clarify metric definitions
Merge remote-tracking branch 'wikimedia/develop' into develop