Allow setting "none" affiliation
Merge branch 'master' into plugins