Merge branch 'master' into auth-acl
auth views
Merge branch 'auth-acl'