Merge branch 'master' into bc-namespaced
drwxr-xr-x - setup