#285 Permission page gives errors
Merge branch 'version2.1' into version2.2