Merge remote branch 'cmaisonneuve/master'
-rw-r--r-- 595 README
drwxr-xr-x - files
drwxr-xr-x - lib
drwxr-xr-x - manifests