composer tweaks
Merge origin/master