Fixed another bug in adding collaborator.
Merge branch 'master' into release