Hi Andrew, can you please merge these two patches? The first is a small cleanup, the second fixes actual bug when SGID on directory is wrongly cleared when inheriting ACLs from parent directory (see changelog of the second patch for details). Thanks! Honza