Removed permissions from this module as it should only contain roles
Merge branch 'release' into development
Merge remote-tracking branch 'origin' into release