Merge sonata
COmposer
Update composer
Merge branch 'master' into grunt
Grunt