Merge branch 'composer'