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