Update team members
Merge pull request #2170 from colinschoen/release-2.1

Update team members