Move generic field into Node.
Merge branch 'master' into bug/acm-dsc-508
move to next version
Merge pull request #177 from nla/bug/acm-dsc-508

Promote generic fields.