Merge remote-tracking branch 'toolness/issue-121-api-claim' into v2.0
Merge remote-tracking branch 'upstream/v2.0' into v2.0
Merge remote-tracking branch 'upstream/v2.0' into v2.0
changing the optional status of a few fields
merge conflict
Merge pull request #145 from cmcavoy/more-optional-fields

More optional fields