New feature: Detailed user permissions
Merge remote-tracking branch 'origin/2.05' into 2.05
Merge remote-tracking branch 'origin/2.05' into 2.05
Merge remote-tracking branch 'origin/2.05' into 2.05
Merge remote-tracking branch 'origin/2.05' into 2.05