Merge branch 'proposed'
drwxr-xr-x - bin
drwxr-xr-x - input
drwxr-xr-x - templates