Merge branch 'composer' into master-debugged