Fixed permission problems with the publisher role
Merge branch 'refs/heads/master' into 2.1