WIP
Merge branch 'composer-bin-config' into my-dev