Ripple from Grischa's ACL overhaul
Merge pull request #5 from crawley/master

Ripple from Grischa's ACL overhaul