Avoid crashing if there are multiple fields with the same name.
Merge branch 'master' into language-specific-histograms