Merge commit 'origin/template' into ldap
drwxr-xr-x - etc