bug fix: changes to membership permissions now persist properly
Merge branch 'master' into forms
merge conflict resolved