Fix checkPermissions() for category decorators
Merge branch '2.0'