Merge commit fe88a1d from Tony on wf-numeric-ids branch.   This column is actually an integer.