Made permissions inheritance work properly and cleanly
Merge remote-tracking branch 'origin/master'