Merge from upstream

git checkout develop
git checkout -b MergeFromUpstream
git pull collectiveaccess develop
git push --set-upstream origin MergeFromUpstream