Dev Small fix in permissions model
Merge remote-tracking branch 'origin/2.05' into 2.05
Fixed issue #7684: HTML entities visible in statistics graphs