Merge remote-tracking branch 'puzzle/master'
drwxr-xr-x - manifests