Merge pull request #286 from gorthauer/master

Updates for upstream qbs
Default value for affiliation and role
Merge pull request #289 from trett/master

Default value for affiliation and role